Fixed date time code, finally correct