For ENG-5962, fix broken toString pointed out by Ning