Fix for DB_CUSTOM_V3