Fixing bad copy-pasta