Tweak to get week working correctly