Removed the GOTO introduced in #1