enhancement: fixed #34