pull in a PR from rivets, fixes #20