[#427] fix broken events introduced by cdd31faafa13c6660894556d2826219703f9b146