Ticket #132 - using __update event