Bugfix to data validation.