Better goto handling [ci skip]