fix issue #51
fix issue #61