Should fix issues with db