Fixed more regex