Stack2 fix