Issue/#405

Fixes #405