Issue/#346

Fixes #346