Issue #62 fix