Solution to Date issue