fixed DB-lookup