Fix syntax and duplicate