redo of last patch, missed one for bookinfo