db fix part 2