Fix: regex not complete