Fixing issue #123