Use the proper check() logic again