Fixed a bug introduced by invoking remove on destroy events