Fix for DB retrys Part 1