fix issue #70
fix issue #70