changed handling of strings