Fixed issue #84