Issue/#206

fixes #206