Error persists in domain 2.0.0-beta1 Updated patch from #2 attached. Not thoroughly tested but seems to work again.