enhancement: fixed #22