Fixes installer
Removed goto