Hotfix for Refresh