Fix Modal Pairing Problem