Skip to content

Fix for #1007

Fix for #1007 #284