DataEditor bug fixed