Fixing issue #94.