Correct the implementation of the stack. "wanttracking" flag should work now