Issue/#284

Fixes #284