Fix endless loop in the fault event queue generation - Adrien