Fix construction in different file formats