Fixes #918