Fixes #812