Fix Sprint 2