Fixed schedule by week, one more fix