[AC21.4] Ben's sheap.c change