Fixed listener's not being removed.