Fixed mapping.