Issue #44: Change toStr handling