listen bug fixes