more reasonable solution for #17067