Hacky fix for when 'mapping' is not present.

I have no idea whether this is the right thing to do or not, but it
seems to work.