Fix Last week of supply
Fix
Merge