This may help... #1953

Or I can fork your fork and make a PR myself :wink: