Data table bug fixed