[Review] Sprint 2 Bug Fix