Fixed wrong calculation of next week