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

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