Crash fixed (I hope)