Fixe bugs on validator that was mistakenly considered non-pinhu as pinhu.