Fixed, including joining of files