Fix element mapping