Unit clone fix