ToString method fixed - code complete