Bug Fix: no more super ice cream stack.