Fix start up crash