MSINM-87: Fix toString()