BUG - Event listener not removing properly