Thanks Jannis Leidel for the suggestion.
Thanks Donald Stufft for the suggestion and Susan Tan and Brian Fabian Crain for the patch.