wip: as suggested in the issue, but breaks a test
2 files changed