More work on #731