Fix existence checking