[Fixes #107] WIP

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