Added one more safe check for factory action