Fix packing overlap

Change-Id: I3fa211be09daf3089b0ac54f885a3fb7d1753b2f