Finally fix of Startup