[DCOM-118] fix for issue #195 

I'm sorry, i have no idea why i got here now 23 commits .. i tried but no success.