This code does NOT fix the Product Preview ... that will be updated in the next release ...