Port change fix