Fix for non-standard ports