improve stack awareness