handle aliases properly for #596