fixing gift behaviour