Reinstated fixed routine for as and when gifting is fixed