Handling of default port more proper