Fix #524 quick match problem