Fix filename behavior