Fix class fields mapping.