B3563 repaired validation logic