Fixing parsing of 20-21 character strings (MODE-2254)

https://issues.jboss.org/browse/MODE-2254