hotfix for v210a