Fixed more crashes
merge1