Another fix for broken mappings