Issue/#367

Fixes #367