Should sort out problem with db files