This *might* fix the end-of-week exception, but honestly, I didn't test it.