fixed issue with the lost of events