fixing dao problem