Add more checks, still not working