Fixes #687