database fixed finally