Fix copying plus generating them