Or the one way that works for now in those situations: the dreaded auto-resolve