Issue/#283

Fixes #283