Skip to content

Fixes for #1853

Fixes for #1853 #1284