fix bug with field naming