Move config check to matched check for consistency