Tried to fix mapping.