Corrected issue with non-existence of a future week