Fix for database lookup.