Fix bug #730
Merge pull request #682 from FHenry/3.3

Fix bug #730