Fixed the event infinite loop! Should work!