Small bugfix on DataForm