blob bugfix: squash into original changes