Fixes #860