fix bug related to upstream branch