Fix fire event