Better git checkout fix