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