Fix listeners for controllers