[JBMAR-171] call prepareFields before cloning fields to prevent NPE
Merge pull request #31 from bmaxwell/JBMAR-171

[JBMAR-171] call prepareFields before cloning fields to prevent NPE