Fixed Invalid Date exception