added fixing in mapping