Added better mirror checking