Compile fix
Crash fix