fixup! StateStack