Fixed bug where drive was no longer valid and causing a crash