DB: More fix