enhancement: fixed #42