enhancement: fixed #46