Fix when giving/taking from gaia

Fix when giving/taking from gaia