Fixed problems with listener visibility