Fixed handling of drive naming above 9 drives