fixup version 2 behavior