A fix to the AvailableFields list behaviour