Fix for bug 986981

Signed-off-by: achbed <github@achbed.org>
Merge pull request #249 from achbed/dsw-986981

Fix for bug 986981