Fix field conflict

This pull request will close #3 .