changed short string handling