further fix issue #66