Fixing toString bug