fieldChooser fix?
fieldChooser fix?