first attempt for #10602