slightly less dumb intersection handling