enhancement: fixed #38