fixed filename handling