Fix merge error in 2a58389ad1073555781deb672fbc0c5d997931f2