[Fixes #107] WIP

- [ ] failing test
- [ ] fix it
- [ ] think about other related edgecases