fix Giftwrap issues