Added again check extension in a different place