Fixed preRemove listener as well (see #13)