Part of the stack fix