fixing with fields and empty values