Continued fixing mapping logic.