first pass on E000215, #391