Fix issue #86