Fix copy-and-paste symptom