Feature/issue206

implemented fix. no test case.