Skip to content

Fixes from tests

Fixes from tests #26