Merge "Fix copy/paste error"