Investigate how to avoid bugs like #85 from showing up. Clearly, the unit and e2e tests failed in revealing this bug. We should investigate how was that possible and figure out how to properly test this out