l2pop fix

Change-Id: I7399f27cf5429d5bbe113695a89afd7e583e3560