Issue/#364

fixes #364