Work on #243, this fixes the week constant being wrong