Fixes #863