Fixed the structure of the reverse-engineered mapping