Fixed issue with empty strings.