Skip to content

Fix for #596

Fix for #596 #1878