Fixed the final check