Fixed custom commands failed, Attached interdiff for same.