fixing destroy events never firing