Restore empty ext check & remove dot