diff --git a/src/Airports/dynamics.cxx b/src/Airports/dynamics.cxx
index 8b6aed9c6..3ae486401 100644
--- a/src/Airports/dynamics.cxx
+++ b/src/Airports/dynamics.cxx
@@ -167,7 +167,6 @@ FGAirportDynamics::FGAirportDynamics(FGAirport * ap):
 // Destructor
 FGAirportDynamics::~FGAirportDynamics()
 {
-    SG_LOG(SG_AI, SG_INFO, "destroyed dynamics for:" << _ap->ident());
 }
 
 
@@ -183,12 +182,18 @@ FGParking* FGAirportDynamics::innerGetAvailableParking(double radius, const stri
                                            bool skipEmptyAirlineCode)
 {
     const FGParkingList& parkings(parent()->groundNetwork()->allParkings());
-    FGParkingList::const_iterator it;
-    for (it = parkings.begin(); it != parkings.end(); ++it) {
-        FGParkingRef parking = *it;
+    for (auto parking : parkings) {
         if (!isParkingAvailable(parking)) {
           continue;
         }
+        
+        if (parking->getRadius() < radius) {
+            continue;
+        }
+        
+        if (!flType.empty() && (parking->getType() != flType)) {
+            continue;
+        }
 
         if (skipEmptyAirlineCode && parking->getCodes().empty()) {
           continue;