Fixing the keep-copy issue