data validation fixed #1