Fix extension issue