Fixed issue parsing dates