fix alias handling