fix #7. resolve #8.