Issue #61 fix