enhancement: fixed #37