Data validation bug fixed