fixing listeners still