fixing issue #94