Fix Match loading