refactor soa validation condition thx @LAndreas