Resolved data table issue