v1.1.2.417 - properly implement the event