Fix current week logic