issue #61 fix