fix for NPE when argument selector is Fields.ALL