More work for #580