Fixed losing track of stack below when emptied