hazard evaluation bug fixed