enhancement: fixed #69