Fixed issue #85