Stack bugfix