Wrong registrar on .pl domains

[bessone]

PHP-Whois version: 4.1.4

Description
For Polish domains (.pl) the registrar is not recognized correctly.
Instead of taking the company name, the last line of the block, i.e. the fax number or whois url is taken.

How to reproduce
Just do the whois of these domains and get the registrant:

• perrier.pl the fax number is retrieved
• google.pl the whois server url is retrieved

Possible Solution
I don't think it's a problem of the regular expression, but of how the single lines are looped to retrieve the various blocks. I took a look but couldn't figure out where to work and fix it.