fixed #62
- Issue #63