Attempt to fix random DB issue