Fix submit and get challenge