added scrub_fname back