Attempt to fix the stacks