fix last issue due to refactoring Field