still fix on product mode