fix #2434 remove side effect of #1638