Port is now added to the pattern, fixed regexp for matching