Fix listeners saving