Fixing stopping and starting of hazard generation.