Fix/week numbers