Fixes #874