Issue 808

Fixes #808.