HOTFIX: Orphaned blocks workaround