fix issue #81
fix issue #81, #82