spped up alias lookup time, update #1446