[fix] product generation fix - part 1.