enhancement: fixed #53