Fix merge error from ba6ac8af7b