Fixing on products server side