Date issue fixed