Skip to content

Stack trace fixes

Stack trace fixes #633