Small validation bug with 2-level check fixed.