Fix forward match