fix missplaced code

Change-Id: Ia2ce6393fadf7ac01f451261c8ce12bac25eaf79