add fix for stack