Fixed challenge mapping