Fixing issue #163