Fixed issue #83