Fixed stub last in critical conditions (when stub is actually not required)