Fix #524 quick match behavior