Try to fix discontinuous matches