Fix mass rebuild