I’ll just put together a patch so we can get a more concrete picture of what’s going on