Issue/#475

Fixes #475