Fix settlement of gift card #5935