[Sprint 49] Bo fix