Fixing issue #764
Fixing issue #764