[Dev] Sprint 1

Bug fix