Issue/#353

fixes #353