NEXT: Correct string values

*cough cough*