Merge pull request #2871 from Tolriq/faster_fix_filetype