Fixed bug that used old DB structure.