change <base> handling again