Added one more check