fix bug with replace old *LOs

Change-Id: I9e6278b62608cf36fa7e5e228f234cc8199c17fc
Merge "fix bug with replace old *LOs"