[delivers #61862640] final bugs fixed