Corrected mapping errors.