enhancement: fixed #10