Fix listeners