Only send fields arg if necessary