Fixed issue when adding data to durg, contain tables