Fixes #811.