Sprint 1 Bug Fix