optimization broke most things, repaired it ..