Fix: Losing DB connection bug