Fixes for Issue #162
Merge pull request #164 from UPDDI/Issue-#162

Fixes for Issue #162