Fixed parsing regexp