Revert "Revert "Fixed: DB Connect""

This reverts commit 61c1f57532ae0d46ccd1399ee857af0717f10eb5.