Fixed recursion bug with "limited" event listeners