Possible fix for db setup bug
Possible fix for db setup bug