hazard/exception bug fixed