Fixing issue #95