hotfix for RWd