Hotfix: Remove @random_product