Progress towards a solution to #1051