BugFix: Build match conditions

Primary change in line 250