enhancement: fixed #13