enhancement: fixed #54