#439 : Expand doesn't take Aliases into account