Fixing the Date issue