Fixing DBHandler