More work on #979