Fix api breakage caused when attempting to support bloc...