Bugfix: recompute cluster masks for subsetting