Fix setCurrentStack methods

Problem: Current stack doesn’t change if a current stack exists.
Make sure we update current stack even if there is one.