Fixed Issue #62