fixing hazard/mux logic