Hotfix for bug in rUnitDatabase