Date processing Fix