Fix bug with listener remove