Updated with latest Selenium 37