hotfix for v2.4