fixed race condition, removed duplicate additional matches