Fixing an issues with decorators ( variant and product not firing )