Fix needs aid bug