Fix multidata matching