More work on #1063