Fix alias matching