PIM-3221: Fix little bug in validator
PIM-3221: Fix cs