fixed aliases handling