patch C001070 to fix some previous problems
Merge pull request #1064 from bsmithgall/C001070-patch-2

patch C001070 to fix some previous problems  #540