Fix to firewal router validation