Issue/#318

Fixes #318