Hotfix for v3.2.0.0