Fix an error after merging