Fix for new ISO8601 structure