fixed listening issues