Fix #32 - cherry picking data validation