Crash fix
Merge error fix