Guilotine crash bugfix