Fix final check