Fixed file extraction