Fix a merge problem of 83882947a81b51234114031dc0acf310c606672d