handle aliases correctly