enhancement: fixed #18