Fixed non-string data issue