bug fix - challenge handling