Fix on Event fuel-shutdown implementation