Added special treatment for strings.