Fix rebuild_compute too