Worked around problem parsing dates