Fixed the casuistry of different type of extensions