Fixed bug with circle listeners