Fixes #811
Fixes #810