Fix syntax issue after merging