Fix for null terminated string error.