More work for #2121