PregMatchOptimizer fix