Fix DatabaseConnect