fixed database problem on my branch