That problem should be uniformly and robustly solved by adding the dep I suggested.