Fix for math eval mappings