fix issue #85