Fix current week algorithm