Vinod's DB fix