I might have misunderstood something here, but I don't think this should be needed, as long as the other changes I've suggested are implemented.