Fixing issue #131

Fixes issue #131