More work on #901