Might be a silly question but are you sure you have the right canopy? The D22's changed their tub length when they changed manufacturing locations (Spain to Thailand) Yours, an 04, I think is a spain build and thus have a shorted tub than some other, later D22s.