fix #30
Merge pull request #31 from balihoo/Issue30

fix #30 by removing premature field addition (it is done in later state as well)