fixed bugs (match id)