fixing cross branch build issue