Source Analysis fix