fixup: fix according to bob's review