Fixes #8065
Merge pull request #659 from slarosa/fix_8065

[DB Manager] Fixes #8065