Remove basket cloning to avoid issues