Issue/412

Fixes #412.