Added propper string recognition.