it's a topic of #2363, but the change is small and is better to be fixed here because it would cause conflict.