Issue/#303

Fixes #303