Fixes #897