Fix issue #85