maybe fixed database problem