Fix problem with filename synthesis