Fix match removal