More robust date logic thanks to Javier Jimenez Shaw <j1@jimenezshaw.com>