Think this resolves the refresh issues

[#58587658]