Fixed crashing
again