Fixed composite/multiple filetype bug