Fix production problem (Nulls, and percolation)