Sprint 3 : Quick fix