Update for 3.5.2 hotfix