Fix current week calculation.  Fixes #7