fixing issue #81