fixing again
Merge branch 'hotfix/product-fix2'