Small fix to improve data validation