Fix Tenders bug