Crash on start fix