Fix of PR #110
rebased onto d7b29b21b413f88650b1ba1c2003d709aaebb968
Pull-Request has been merged by sidpremkumar
Fix of PR #110