Issue/#370

Fixes #370