fixed regexp parsing