I went through the same thing in Calgary a couple months ago.

By the time they figured it out I had 5 minutes to get through customs and security, so I didn't ever hear what they did to make it work.