bugfix on listener