enhancement: fixed #66