Final fix. Preserve initial file name