Hotfix for rUnitDatabase