Fixed issue #73