Fix the conflict of #126