hotfix for BK-9382