fixed some issue with product class