Fixed adding multiple useless listeners