Changed to use buffer local port