Fixed alias handling