Fixed validation bug for types > 19