Potential quick nasty fix for repairing hazards