Fixed event bug!