FIx for Challenge casting exception