Fix handling of strings