Fixed bug with Driving