Fixing ISO8601 bug