fixing makeDate