enhancement: fixed #28