fix listeners removal order