new fixes
bugfix - do not empty the stack
fix when stack empty