Issue/#336

Fixes #336