That 2 year extension is certainly looking like the right choice at the moment.
For the record, I don't think Sam's production is due to lack of effort or anything. I think it's a lack of chemistry with line mates who aren't Jack. Elie-Casey-Sam might look good in a few months, but I don't think Sam should be counted on to carry that line...