Fixed fatal crash on startup