Make truckstop more robust