Merging possible databse fix. Need to test
resolve