Removed unnecessary cloning to fix timeout bug