DB bug fixed