Fix checks order bug