Fixed is_final_submission