Fix missed cases