Issue/#239

Fixes #239