Added one more if clause