Merge "Fix syntax error after adding -d"