fix issue #86