Fixed IRI support returing wrong string types on 2.x