fixed bugs in match after syntax update