fix conflict of #2050