Fixing issue #44