Fix for the mapping