Just a suggestion: maybe file a PR against the fs project itself?