Issue431

Fixes #431.