Wishlist hotfix