Infinite loops resolved / pivot selection change