Bug#146: Now show the port only if is needed