Fix issue with single instance of driver