DB connection issue fix