Multiple DB fix