Feature/string fix