Fixed crash on start up