Fixes #854