Fixing challenge population code