Fix tracking issue
Fix the stacks value