Fix [ bug #737 ]
Merge pull request #695 from FHenry/3.2

Fix [ bug #737 ]