Fixes #814