Baseline algorithm, as a tool in wavefront sensing (WFS), incorporates the phase-diverse phase retrieval (PDPR) method with hybrid-unwrapping approach to ensure a unique pupil phase estimate with high WFS accuracy even in the case of high dynamic range aberration, as long as the pupil shape is of a convex set. However, for a complicated pupil, such as that in obstructed pupil optics, the said unwrapping approach would fail owing to the fake values at points located in obstructed areas of the pupil. Thus a modified unwrapping approach that can minimize the negative effects of the obstructed areas is proposed. Simulations have shown the validity of this unwrapping approach when it is embedded in Baseline algorithm.