Attempting to fix yet another strange driver-related bug