Fixed slight issue with string garbage