Issue 446

Fixes #446