Avoid regexp in Save(); resolves #9