Validation fix
Fixes