enhancement: fixed #8