[Track-303-2] Fix phase loop to end when correct phase is chosen (#2479)

[Track-303-2] Fix phase loop to end when correct phase is chosen (#2479) #347