Crash bugfix (Guilotine)