Fix: Find previous match