Corrected crunch mappings