Fix DatabaseConnect once again