One more fix for DB_SUFFIX