fix issue #94, #70