1.0.0:Lou:22 Fixing the event fail