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

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