Partial fix for bug #3820 (hide_db)