further patching to cope with no ref to shape in buffer