Issue 467

Fixes #467