fixed issues: #8