fix issue #80