Fixed bug on startup