CAD-1: last fix still did not work, revised again.