Modified ALL disambuguation bug fix