Fixing issue #227