Date retrieving fix