Fixing bug in Layer 2 matching.