The autocorrelation function of Composite BOC(CBOC) signals has many side-peaks, which leads to the ambiguous problem. To solve this problem, an improved two-stage unambiguous tracking scheme is proposed in this paper. In the first stage, an unambiguous correlation function with narrow main peak is constructed by combining four out of twelve sub-correlation functions. In the second stage, by adding the rest of sub-correlation functions, the final correlation function with sharper and higher main-peak is developed based on the preparatory function from the first step. Numerical results demonstrate that compared to the original methods, the proposed scheme has a better tracking performance and can effectively suppress the short delay multipath.