Hotfix for 2.1.29.