Fixing issue #153