Fix for no-block-data case.