Week change bug fix !!