[Tested] crashfix?