Fix [ bug #736 ]
rool back changes
Fix [ bug #736 ]
Merge pull request #700 from FHenry/3.3

Fix [ bug #736 ]