Fix for Convert.ToString