Rapid Driver bug fix