Still fails, but is slightly more robust