Fixed missing replacement of andrewid