Fixing the startup code