--- a/locationmanager/locationtrail/src/clocationrecord.cpp	Fri Mar 12 15:44:28 2010 +0200
+++ b/locationmanager/locationtrail/src/clocationrecord.cpp	Mon Mar 15 12:42:24 2010 +0200
@@ -403,6 +403,13 @@
                 		)
                 		}
                		iRemapper->StartRemappingObjects( iNewItem.iLocationData );
+
+                    if( iObserver->WaitForPositioningStopTimeout() && !RemappingNeeded() )                                
+               		    {                                                
+                        iObserver->RemapedCompleted();
+                        return;
+               		    }
+               		
                 	}
                 if ( iState != RLocationTrail::ETrailStopping )
                 	{
@@ -1094,12 +1101,16 @@
     CMdEProperty* property = NULL;
     
     object = iMdeSession->GetObjectL( aObjectId );
+    CleanupStack::PushL( object );
     object->Property( timeDef, property, 0 );
     if ( !property )
         {
         User::Leave( KErrNotFound );
         }
-    return property->TimeValueL();
+    
+    const TTime timeValue( property->TimeValueL() );
+    CleanupStack::PopAndDestroy( object );
+    return timeValue;
     }
 
 EXPORT_C TBool CLocationRecord::RemappingNeeded()