CS-3: Bug fix for product code field