Massa to recover in time for Canada 