QinQ alternate fix

This diff fix QinQ problem fully