added DB fix