Better way to fix the remote webdriver