DanielA-Fixed issue with database

Issue with duplicate from merge