Fixing validation