Fixing issue #743
Fixing issue #743