Working on untar bugs