Issue/#351

fixes #351