Is there a possible way to make the date chose the next occurrence, rather than jumping to 2001?