EVENT BUG FIX