Hotfix for 2.1.42.