Future Date issue solved