Date issue solved