Skip to content

Delegation fixes

Delegation fixes #447