Fixing issue #173