hotfix for downward compatibility