Fix issue with condition update event