Challenge availability fix