More work on #1082