Possibly fixed a cave-in related crash