fixes #198, #199
fixes
merge fixes
DA FIX
Merge pull request #204 from Team-Delta/task-1508

fixes #198, #199