enhancement: fixed #61