Fix for prefixed DBs