Fixes #166
patch #1
Merge pull request #167 from Team-Delta/task-1076

Fixes #166