IMPORTANT / Fix syntax error after merge