Fix unwrapping of the content map.