Fixing issue #132