bug fix when firing listeners