Fixed issue #82