fix listener removal