Fix on Wish list issue