enhancement: fixed #12