Issue #12: fix next week calculation