Fix/startup