Fix for removeEventListener with non-null target