Work on #952