Removed my precious goto.