Bugfix in removeEventListener