commit before field-refactoring