first round of resolving E+STRICT errors