DB fix, take 1