SP challenge generation fix