Fix previous wrong merge