Fixes #903