Made a PR into strfry implementing this change