Added one more round of checking. Works