Fix Fatal on product