CD-13123 I'm fixing things