AG-4241 fix with validation